Moved code to main folder