Removed hbs module and added structural files