Bringing this project in line with standard conventions