Moving files to proper structure. Adding server folder