Changed various files and the generator, now it has a basic layout