Organized everything into the decided packages.