moved all modules to separate folders. Adapted all imports