Restructured directory
Removed old directory names
Files moved to more appropriate directories