Moved classes into folder and added timer class