Updated comments and moved files to correct dir