Restructured controllers, added fixtures, added dist generation