Changes to structure

Moved directories around etc to make things more accessible