Fixed directory structure
Removed all default package classes