Directory structure/organization and more implementation