Added new files to beautify and modularize
Beauty