Organize & Clean up project