fixing some issues with file structure.