Moved some includable files to 'inc' folder