File names changed & Code cleaned