Move abstract classes out of Formula directory
Remove obsolete hacks

Closes #1255.