Big commit

Added file and folder types, utils and improvments