Reworked file structure and files to use Liquid