moved source into sub-directory and changed includes