Some new functions added and inproved project structure