Move modules into it's own folder