Adding Utilities class and reorganizing directory structure a bit