Reorganized some stuff and did some modifications