Re-arranging files and testing