moved twom out of the shell and into the main build file, cleaned up fs a little too