Cleaned Project Structure up