Reorganized files, make basic class skeletons