some more structuring and basic files