reorganized folder and cleaned up shit