Restructure project and imports