Cleaned up project tree