[Bugs] Fixed folder/package hierarchy