Moved reuseable components into subdirectory