Added some functionality
Removed unneeded folder
Removed unneeded folder