directory structure update, removed include dir, divided files onto modules