removed minitest requires
cleaned up directory structure a bit