Remaking folders due to bug
added initial support for self-tuning