Cleanup and organization. Removed some junk files.