Client and Server moved to app folder