Clean up + package restructure