Adjust file structure for easier using