Restructuring code. Directory structure has changed.