Refactor file structur again