I had the same issue and it was very frustrating. However, I did find a solution. Before adding your apps to the folder, make sure you tap settings (while in the app drawer) and select "sort by" then make sure "custom" is checked off. After doing this, your apps should stay inside your folders...