Final Cleanup

Cleaned up file system. And fixed for live server.