Changed folder structure to be suitable for npm deployment