Changed my mind about file structure