Changed file structure to packages