changed the folder structure. take a look you may want it