adding new dir structre
removed hacky files