add autoload and restructure dirs