Formatted code

Moved/created/deleted packages and moved test classes.

Tried to do some improvement