Updated project. Moved some files