updated file structure (thanks Sebastiaan!)