[Github Issue #23] Cleaned up codebase and directory