Changed file names and structure to accomodate modman file