Removed test file; re-organized files