Reorganize project and bring in dependencies