Reorganize project for easier packaging