Cleanup filesystem

Signed-off-by: dluetke <dluetke@gmail.com>
Changed templating from JADE to underscore