Serialization added, folders refactored