Rearranged some project files into separate packages to retain some form of sanity