Moved files to make it less Eclipse style