Rename Project and Organize code