Refactor

• Update to default package structure:

src -->
    main -->
        java
        resources   
    test --> 
        java
        resources