Moved some scripts around to get rid of unjustified subdirectory