Made code cleaner & renamed files