Start removing pointless nesting and fixing imports to be relative