Changing file structure so that it is easier to import commonly used functions