Moved files to app-specific directories & renamed require