Did a bit moving/renaming in order to better organize the codebase.