Directory restructure

Projects cleaned up