Made file structure more Pythonic