changed file structure, added remaining files