Updated and cleaned up directory structure for development