Cleaned up directory structure for needy Cuong