restructure project to a cleaner format.