Removed redundant functions
Added test folder but not sure its a good idea