changed file structure to allow python packaging