Moved files to inc directory