renaming php class, using common.php for includes.
And moving files in the correct folder.