Moved code to single file
Move code to one file