Move literals into their own directory and give them better names
Move steps into their own directory and give them a better name