Reorganized files and added servelogic