Trying to get a cleaner project.