first rework for composer support, restructure file system