Restructure project according to https://gist.github.com/agendor/9922151