coverted to scalable filestructure and added routing FIXED