Rearranged files, added import paths