Added assembly. Reorganized to src/main/java