fixed build and changed file structure