changed file structure
modified file structure and got everything working again