Organization

Removed some test folders and re organized.