Moved items around and removed even more unused files