Added sub folders and started API