Redesign

Complete redesing, easier file management