Moved scripts directory and cleaned up