Reorganized folder structure

Moved everything up one level