changed file structure and adapted make file