Little changes and moved to subfolders due to discovery