changed file structure, other minor changes