Moved internals to own folder