Cleaned devfiles moved files into correct places