Added new code and moved to new folder