Moved external stuff to a separate folder and organized imports