Changed Directory Structure

Changed Directory Structure
Cleaned up Makefile files