Code restructuring - fixes #10
Version sharing between all files - fixes #11