Restructure packages and project