Fix  memory issues
Put everything in one file
Remove old files