changed structure to be able to use homesick (https://github.com/technicalpickles/homesick)