Made the project structure a bit less flat
Renamed some functions to be more in line with ruby style