Refacting module package way and moved script into separate folder.