Moved stuff around and renamed things. Created a major listing script too.