Changed folder structure and changed package annotation in all java
files